From 5c16de71f5ee5e2a146a472164f6f34fd5b4dca4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 27 May 2019 20:30:48 -0400
Subject: [PATCH] app chooser widget: Make final

---
 gtk/gtkappchooserwidget.c | 23 +++++++++++++++++++++
 gtk/gtkappchooserwidget.h | 43 ---------------------------------------
 2 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/gtk/gtkappchooserwidget.c b/gtk/gtkappchooserwidget.c
index 9ff532dc2f..5b6d37d207 100644
--- a/gtk/gtkappchooserwidget.c
+++ b/gtk/gtkappchooserwidget.c
@@ -71,6 +71,29 @@
  * GtkAppChooserWidget has a single CSS node with name appchooser.
  */
 
+typedef struct _GtkAppChooserWidgetClass   GtkAppChooserWidgetClass;
+typedef struct _GtkAppChooserWidgetPrivate GtkAppChooserWidgetPrivate;
+
+struct _GtkAppChooserWidget {
+  GtkWidget parent_instance;
+
+  GtkAppChooserWidgetPrivate *priv;
+};
+
+struct _GtkAppChooserWidgetClass {
+  GtkWidgetClass parent_class;
+
+  void (* application_selected)  (GtkAppChooserWidget *self,
+                                  GAppInfo            *app_info);
+
+  void (* application_activated) (GtkAppChooserWidget *self,
+                                  GAppInfo            *app_info);
+
+  void (* populate_popup)        (GtkAppChooserWidget *self,
+                                  GtkMenu             *menu,
+                                  GAppInfo            *app_info);
+};
+
 struct _GtkAppChooserWidgetPrivate {
   GAppInfo *selected_app_info;
 
diff --git a/gtk/gtkappchooserwidget.h b/gtk/gtkappchooserwidget.h
index 0d9dc26cc6..defef6ef7e 100644
--- a/gtk/gtkappchooserwidget.h
+++ b/gtk/gtkappchooserwidget.h
@@ -37,52 +37,9 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_APP_CHOOSER_WIDGET            (gtk_app_chooser_widget_get_type ())
 #define GTK_APP_CHOOSER_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_APP_CHOOSER_WIDGET, GtkAppChooserWidget))
-#define GTK_APP_CHOOSER_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_APP_CHOOSER_WIDGET, GtkAppChooserWidgetClass))
 #define GTK_IS_APP_CHOOSER_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_APP_CHOOSER_WIDGET))
-#define GTK_IS_APP_CHOOSER_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_APP_CHOOSER_WIDGET))
-#define GTK_APP_CHOOSER_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_APP_CHOOSER_WIDGET, GtkAppChooserWidgetClass))
 
 typedef struct _GtkAppChooserWidget        GtkAppChooserWidget;
-typedef struct _GtkAppChooserWidgetClass   GtkAppChooserWidgetClass;
-typedef struct _GtkAppChooserWidgetPrivate GtkAppChooserWidgetPrivate;
-
-struct _GtkAppChooserWidget {
-  GtkWidget parent_instance;
-
-  /*< private >*/
-  GtkAppChooserWidgetPrivate *priv;
-};
-
-/**
- * GtkAppChooserWidgetClass:
- * @parent_class: The parent class.
- * @application_selected: Signal emitted when an application item is
- *    selected from the widget’s list.
- * @application_activated: Signal emitted when an application item is
- *    activated from the widget’s list.
- * @populate_popup: Signal emitted when a context menu is about to
- *    popup over an application item.
- */
-struct _GtkAppChooserWidgetClass {
-  GtkWidgetClass parent_class;
-
-  /*< public >*/
-
-  void (* application_selected)  (GtkAppChooserWidget *self,
-                                  GAppInfo            *app_info);
-
-  void (* application_activated) (GtkAppChooserWidget *self,
-                                  GAppInfo            *app_info);
-
-  void (* populate_popup)        (GtkAppChooserWidget *self,
-                                  GtkMenu             *menu,
-                                  GAppInfo            *app_info);
-
-  /*< private >*/
-
-  /* padding for future class expansion */
-  gpointer padding[16];
-};
 
 GDK_AVAILABLE_IN_ALL
 GType         gtk_app_chooser_widget_get_type             (void) G_GNUC_CONST;
-- 
2.30.2